a11y: Remove hack for old code

This code was supposed to work around a bad interaction between GOK and
Nautilus from 7 years ago.
If it still exists, the GOK developers may complain to the Nautilus
developers.

https://bugzilla.gnome.org/show_bug.cgi?id=137401

diff --git a/gtk/a11y/gailbutton.c b/gtk/a11y/gailbutton.c
index f8c648ed7ecc3b6ae523e4e3308f924d728802c4..f71e26d250561ddf240b8047be61d4662855686a 100644 (file)
--- a/gtk/a11y/gailbutton.c
+++ b/gtk/a11y/gailbutton.c
@@ -227,41 +227,6 @@ gail_button_get_name (AtkObject *obj)
   return name;
 }
 
-/*
- * A DownArrow in a GtkToggltButton whose parent is not a ColorCombo
- * has press as default action.
- */
-static gboolean
-gail_button_is_default_press (GtkWidget *widget)
-{
-  GtkArrowType arrow_type;
-  GtkWidget  *child;
-  GtkWidget  *parent;
-  gboolean ret = FALSE;
-  const gchar *parent_type_name;
-
-  child = gtk_bin_get_child (GTK_BIN (widget));
-  if (GTK_IS_ARROW (child))
-    {
-      g_object_get (child,
-                    "arrow_type", &arrow_type,
-                    NULL);
-
-      if (arrow_type == GTK_ARROW_DOWN)
-        {
-          parent = gtk_widget_get_parent (widget);
-          if (parent)
-            {
-              parent_type_name = g_type_name (G_OBJECT_TYPE (parent));
-              if (g_strcmp0 (parent_type_name, "ColorCombo"))
-                return TRUE;
-            }
-        }
-    }
-
-  return ret;
-}
-
 static void
 gail_button_real_initialize (AtkObject *obj,
                              gpointer   data)
@@ -304,7 +269,6 @@ gail_button_real_initialize (AtkObject *obj,
                           G_CALLBACK (gail_button_label_map_gtk),
                           button);
     }
-  button->default_is_press = gail_button_is_default_press (widget);
     
   set_role_for_button (obj, data);
 }
@@ -527,13 +491,6 @@ idle_do_action (gpointer data)
   while (!g_queue_is_empty (gail_button->action_queue)) 
     {
       gint action_number = GPOINTER_TO_INT(g_queue_pop_head (gail_button->action_queue));
-      if (gail_button->default_is_press)
-        {
-          if (action_number == 0)
-            action_number = 1;
-          else if (action_number == 1)
-            action_number = 0;
-        }
       switch (action_number)
        {
        case 0:
@@ -612,13 +569,6 @@ gail_button_get_description (AtkAction *action,
 
   button = GAIL_BUTTON (action);
 
-  if (button->default_is_press)
-    {
-      if (i == 0)
-        i = 1;
-      else if (i == 1)
-        i = 0;
-    }
   switch (i)
     {
     case 0:
@@ -645,13 +595,6 @@ gail_button_get_keybinding (AtkAction *action,
   gchar *return_value = NULL;
 
   button = GAIL_BUTTON (action);
-  if (button->default_is_press)
-    {
-      if (i == 0)
-        i = 1;
-      else if (i == 1)
-        i = 0;
-    }
   switch (i)
     {
     case 0:
@@ -723,17 +666,7 @@ gail_button_action_get_name (AtkAction *action,
                              gint      i)
 {
   const gchar *return_value;
-  GailButton *button;
-
-  button = GAIL_BUTTON (action);
 
-  if (button->default_is_press)
-    {
-      if (i == 0)
-        i = 1;
-      else if (i == 1)
-        i = 0;
-    }
   switch (i)
     {
     case 0:
@@ -777,13 +710,6 @@ gail_button_set_description (AtkAction      *action,
 
   button = GAIL_BUTTON (action);
 
-  if (button->default_is_press)
-    {
-      if (i == 0)
-        i = 1;
-      else if (i == 1)
-        i = 0;
-    }
   switch (i)
     {
     case 0:

diff --git a/gtk/a11y/gailbutton.h b/gtk/a11y/gailbutton.h
index cf8c659345fb2b7babc9dd536a79a7e9aeb2c834..fbc0b76afc7ef8d1f69c10102a1cb0e159586b53 100644 (file)
--- a/gtk/a11y/gailbutton.h
+++ b/gtk/a11y/gailbutton.h
@@ -52,8 +52,6 @@ struct _GailButton
   GQueue        *action_queue;
 
   GailTextUtil  *textutil;
-
-  gboolean     default_is_press;
 };
 
 GType gail_button_get_type (void);